Eng: More universally

Copyright©2025 Neil Keleher.
All rights reserved.